Add covenants and RAP