DB, Annotation refactor, ...