Added true support for alternate folders and additional formats