Add more description and more planned improvements