Changed config layout; Prepared for issue #1