Alter DB schema
Fix queries