Implementations of descriptors moved to a separate package