Improved the "moduleBuilder" to support (in array) "annotated" services; additionally also improved the specs a bit more.