Extend functionality
====================

To be done at a later point.