Added focus and manager beheer