Added strong naming