Added some configuration annotations, refactored the existing annotations towards cleaner default values.