Enhanced block entities (17/18)

Enhanced block entities