Rename function, more service like interface