Added Fields for hot fix