Search Space and Representation improvements