Moved containers to service layer