Added common.hpp to add correct shared_ptr to scope