Revamped object generation to something more usable.