Added more requirements