Removed forward definitions