Updated certain aspects and added macros