Fix constructors
Fix entities