Improved the performance a little bit compared to using the full set Change-Id: I28a96459fa77d7e1d5c101d162faa2effd525341