update & fix Injectable services