More use of @Deceitful
Improed architecture for Deceitful classes