Added args map as an option