masks and keywords update