Better support for blank passed values