CDI-18, update decorators and alternatives to account for @Priority