[Core] - Added some basic site handling