Add selection and other stuff