Cleaned up data service
Added debu code