References fixed in usecases