A bit more mysql refactoring