TypeSafe, Duration, Expires and Timestamp annotations added