Removed gap namespace