Cleanup of base methods
include json