Added Configuration class, simplified syntax