Added FS Templates support