Schema changes regarding giovanni feedback + refactoring