Improved site handling