Added service integration
cleanup;