General improvementd on MVP