Added changes to make admin works