Some changes for block plugin manager