Added a bit of objection support and fixed packets