Updated syntax and added meta data logic