Extending the functionality