Fixed headers and added TODOs for tracking
Introduced XMLRecordCreationStrategy
Introduce JSONRecordCreationStrategy
uncommented the after block
added some TODO's to be fixed