Bugfix to properly use service module functionality