Base: More improvements