[UPDATE] Remove provider and some intelegence to resolve template