More stateless
Migration to NetBeans 7.3