Included Description field
Removed duplicate code, optimized mapping