Including proper namespace handling.