Class architecture logic. attached to (Feature #621)