Make payments more dynamic