replaced some Eloquents by ResolvingEloquents
missing include_once s