feature-set related improvements