Improve API auth