Adding new codes for Factor Design Pattern