Moved to modules for extensibility to add a sample