Update support data
Improve comments, simplify `Spec` class
Remove now unneeded `Spec` class to simplify code