Added missing factories from definition