Added constructors, annotations