Added back a lot of core functionality