added some imports and constructors