Added format constants
Removed un-needed field