Improve features for #2