UI Improvements.
A better API that supports more values.