Added a couple of class block options as requested by Rubin and dcraig