updated decorators to support keywords