added ability to extend entities