Implement more entities functionality, modified views