First commit of the Basic Service