Added some stuff for new version features