add proper metrics and fix package on Service