Add a few more validators, split SPs into SP - Oauth, split log based on state