Feature: Added ability to specify long/short name in attr_mapping