Some api changes on adding factories, so their contexts can be set as well. Also checking addable to make sure that factory wasn't None