Added parameters and depends support