Fixing interface functions