Updated Factory with changes in reflection

Fixed #14