Add better constructor and inputstream setter, deprecate old ones