refactored objects initialization, add class for primitives generation