Add more cv stuff