Moved functionality to 'Entity'.