Added keys to Order- and Block classes