added increased functionality to entities