+ [OE-4272] Updates to service layer behaviour after review