Add gost support and some minor details in other classes