Changed to new schemas