Updated design decisions