Merged element.lua and property.lua