Added bookmarking and cleanup