Fixed typo and added External class to factory