Options are a map of code to bytes instead of using Option type.  Temporary change just to make some progress