Added handling for command blocks