Changes for REST mapping