Updated to support arguments