Backend Changes

Minor changes in the backend