Adds support for overriding through argv