Object logic template refactored - docs updated with as well