Added factory with association