Change to lists, add inheritance to yaml
Remove restricting application system for more flexible method