1. Refactoring after integration with AciertoComponents
2. Self-cured method from incorrect data in the database