Add more useflags, add hiera/architecture hierarchy