Added a couple more specializations, renamed header