Added categorical and continuous