Improved the interface