Added correct property names & ids