Add neotokyo support