Adding services for Dashboard; rewrote service methods