More features and some improvements