Removed unnecessary metadata for binding, and adding it where it is currently needed.