Some progress in Lightning support