Done with bucket adding/fetching part