core package refactored, still problems with duplicated objects