Implemented support for variant features