Add guids and implement more security