Added additional endpoints and more exceptions