Shifted out assignment creation into service