Basic setup with new structure