Adding 404 support and simplifying the core method calling logic