Some renaming work to make things more readable
Added the Binary enum