Make some things optional for creation