Fixed record creation