Fix #20, removing keywords
Fix the container detection for components