BUG FIX: MISSING INTERFACES COMMIT