- Fix few methods not using per world level data