Feature/improve cases