Added 12 and svn support