Added custom parameter resolution using Resolve property
Merged