merging kakulukia's changes for POST introspection