- removed resources and added generic Descriptors instead