Make usable for VS2010