Addressed memory issues