Added CSV exclude and some other stuff