Reverted back to include gem. Renamed base class to match gem name.