Update and improve features