Made many methods const