Add option to handle selection manually