Removed eval from service factory