Implemented blueprint and better exception handling