Changed due to performance reason and did not work with installed plugins