Updated some design aspects