Added Entity helper file