Added default folder functionality