Fixed schema for 5.5