Added:

- Performance improved