Change constructors from inlined to external