Change .h to .hpp for consistency