More structure changes and core objects