Add LazyType and LazyArgumentMap