Improved site parser