Update: Documentation & Extra Call Backs