- Fixing arquillian use;
 - Refactoring generic component and business rule set;