Starting to add relic support