DEP-45 component imporovements, refactorisation, fixes