Change: Refactoring
New: Added BC with AANN Template