Added first version of types