Added simple (and bit wrong) argument support