Add more advanced authorization