Add bif support with test