Swiftified DataManager, number handling improvements