Fix close logic
Remove unnecessary interface class
Add message resource