Refactor Entity for update & draw with Interfaces