Adapted Camera concept to new event system