Reogranized and finished data contract for album. Fixed enum emission