Change primal object into enum based handling