Entity kinds

Added the ability to filter entities based on their kind