Added some sanitisation to service layer