Adding 'working date' capability