REVIEW: Implement capability direct component using groovy

Less code / JAXB not needed anymore