Got started on metadata support