Added authorization stubs and token generation on creation