Bump to version 6.0 and add more specs