Added support for using custom value resolvers and static values