Refactorted bean handling into appDelegate