Finish work on metadata!