Refactor Time into a POCO =)