Start replacing all object by simpler structure