Changed how collections and schemas are defined