Added factory's + logica van factory