Add ApiEntity
Update ApiBlock.  Now allows overriding existing blocks.