[FIX] Updated interface