Feature/new loader witness