Added constructors to entities