Add some enteties & handlers