Improve perfomance