Better but still ugly static objects