Changes made to better use namespace