Add several changes and xlr8r parser