Added configuration possibilities and did some refactoring