Added album search and updated data model.