Improve constructor handling #41