Refaktoring - added prefixes to services