Moving Search model into Services