Add initial support for optional args