Made compliant with micro deps spring libs