Added entries for O, P, Q and R