Added fileset support