Fixing interface return type