Added types for entities