bugfix: updated core classes