Fixed depencies + switched cors implementation