Extend functionality