Prepare to implement quick add