Updates to using some of types