Replace deprecated blocks