Solved design issues