Issue #400 - Add changes to backend