Added more methods/entities