Fixes and register entity added