Add NGW layer support