added userType and change way to include containers