Feature/upgrade core and modules