Restored most of the previously available functionality.