Bring api in line with the core-dsl concerning Response generation