Added select support; remove later?