Trying to satisfy architectural concerns