Improve / add main