Remove tabular dependency
Add album lookup and track listing from album