Fixed namespace issue and constructor fields