Added billable and project id check