Added more non-functional requirements