refactoring securing annotations WIP