add support for extra arguments