Improvements for Anaconda