Feature/update core and modules