Try to make it work with the new structure