Completed refactoorization of exceptions and added Endpoint draft