Separate fluent api from core