Introduce settings builder and remove prefix