Added types
Types moved to a namespace