Changed to shared_ptr and removed m_ prefixes