added factories, model specs