Proper camera class added and Refresh system updated