Some creation queries fixed and modified