Just a small change to fit the design pattern