Fixed issue: Fixed SQL schema