Added albums and picture functionality