Changing to BIS instead of Mapper / Fixed diff syntax