Simplified and improved API of Entity