Add support for extra, passed args