Add block descriptors, closes #15