Merged FluentAPI with main assembly