Added support for creating extensible entities