Added basic handling for primitives and wrappers.
Added annotation checking.