Updated to also include mysql2