Add support for arguments / environment