Added assembly selector