Reworked scheme file