Updated for MySQL 5.6