Updated lua macros