Rework create method