Removed magic number
Data transfer type adapter and tests