Created new core helper package for more flexibility. Some fixes and more changes