Added more views types