Cleanup
Added support for multiple features
Added support for multiple features