reduced some complexity
added handler aliases for association import