Improve Interface