Change service return type to Long