Improve init method