refactor config annotations