added parameters to db + rename refactorings