Added flash support