Improve Variant functions