Added option to accept params