Changes to simplify the interface