Feature/staf v2  jdk1.7