Updated to 1.7
Restructurized command blocking