Updated to use factory trait
0.7.1