More updates to consolidate and generalize common methods