Added checkbox/select support for extras