Uplimg 0.10 first commit -> some design enhancements