Minor changes, core added, namespace changes