Added support for models and controllers comming from engines, commited missing options file