Minor code optimizations and added attribute mapping (alias's) to ATOM format