Added support for handling features