Removed the block type from the expr.go file and created its own file.