Added distinction between type and symbol declarations