First version with all fields and schema added