Turned factory into component