Change up codegen to handle the gets better