Added support for custom lens