Added Field Alias support, and beautified code