moving some of common to service