Added boost singleton stuff