Added 2/3 non-functional requirements