Improved interface and more options