moved some external dependencies to separate service