removed dependency on static objects