Improve init data