Improve init phase