Changed config a little and added some methods