Claim and add_serial methods added also some bug fixes