Improve depencencies management. Refactor several methods of core
implementation