Updated to comply with BSP changes and daisy branch