Changed from using .h extension to .hpp