Add utility functions and enable selection