Enhanced resources some more