Started working on adding by-factor support