Added support of distinct feature