Added a few more classification schemes