Initial changes for Album module