Better separation between Context/Window; depth support