Correct bundle configuration and service definitions

Bump to 1.1 after merging