1.5.5: Rework constructor.