Classes and functions moved into services