Refactor BlockAdmin classes