Added constructor and moved field.