Postpone add hibernate feature