Added 2 more core types.
Initial work on splitting multi parameters into separate methods.

Still not perfect (generic types not handled correctly) and not works @type data types.