Temporarily tweak annotations for REST compatibility