Add support for min count, empty countable & style target