Added configuration parameter for custom annotations