Adding some design decisions