adding entity support #5 #6