Changed interfaces to fit JSON