2988 - Forgot some @Produces annotations
Merge pull request #4 from jvelasques/core-refactor

2988 - Forgot some @Produces annotations