Architecture advice needed