1.1.2 : added singleton instances for performance