Improve features completion