Changed again to not use Project schema