Feature: Merged in criminal/servant free time from AOD