added subresource support