Refactor annotations to be prefixed with 'Rest'
Parse standard data types including dates