Minor design change, objects init