Fixed services prototype

by Leonard Botezatu