Fixed NoNumber extends
Added same DataTypes