Refactor SBT descriptors