Added conditional for Amount retrieval