Moved DropFactory to API class