Added entity manager and "thank you" osd