Removed rawtypes warning