Extension for Variants and some bugs fixed