Removed Structure and Added Implementation