Improve init