Added model and mock implementations of 2 services