Added basic types.
Updated a bit