Added initial Entity support refactor