implemented more maps and boxed primitive types