Schemes added
Warnings removed for Jenkins test