replacing GenericDao by SlickDao
+ some small code improvements