Got rid of the custom namespace, as it sometimes causes issues.