Updated structure for MySQL