Remove definitions that are defined in enum
Add support to configure the jail used for prisoners.