New interface

Added a more modern interface.