Add service dependency and other minnor changes