Refactored MySql schema