Support more variations