Security update
Import updates and use submodule for core classes