Added FieldInfo & Javadocs