Added back in optional files