Updates for Luna and bugfix to support escaped identifiers (#325)