Refactoring + adding myBatis