Add metadata and update setup