Refactored and added sample objects/errors