Added entity constructors