Additions to service layer