Add some extra security
Add todo
Add status for domains