Added exceptions to be thrown
Import formatting