Add Entry and Exit block according to Paper II