Better service structure
Added source location