improvements on world schema