Changed loading from database