Adding factories, trying to reduce warnings