Use case statement to avoid create new decorators

@stevenwilkin