Initial commit
Added support for more parameters