add condition
Update method loader
Refactaring