Add fifure-related stuff