Added entry points for custom logic