Improvements on swagger-cdi