Implemented more factories